merge trunk
authorK. Handa <handa@gnu.org>
Fri, 10 May 2013 11:15:14 +0000 (20:15 +0900)
committerK. Handa <handa@gnu.org>
Fri, 10 May 2013 11:15:14 +0000 (20:15 +0900)
commit4d7fa0177128378599e362c3b686af62061da442
tree059690fea03feee3aedfe5a556979e7aec5ab317
parentc895abae5511455d758cbfd773a26c2ab4739418
parent78ca998c39bc9a9e68181d66dd13a6c5d3473743
merge trunk